From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 18 Jul 2002 06:15:59 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~31540
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=008307baf69482a249a0c611d5b454dc8c282c7c;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 076487c42fd..109f1d7ebc3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-18  Juanma Barranquero  <lektu@terra.es>
+
+	* international/mule-util.el (string-to-sequence, truncate-string): Add
+	autoload cookie to obsolescence declaration.
+
+	* rect.el (move-to-column-force): Likewise.
+
+	* composite.el (decompose-composite-char): Likewise; also remove
+	redundant info.
+
 2002-07-18  Kim F. Storm  <storm@cua.dk>
 
 	* loadup.el: Load international/utf-8 before international/characters.
@@ -73,6 +83,7 @@
 	* international/utf-8-subst.el: Populate utf-8-subst-rev-table.
 	(utf-8-subst-table): Don't set.
 
+>>>>>>> 1.4125
 2002-07-17  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule.el (define-coding-system-alias):